bitkeeper revision 1.1417 (4288978f3pl8Y0ZehuTzgD3t8zHfhg)
authorcl349@firebug.cl.cam.ac.uk <cl349@firebug.cl.cam.ac.uk>
Mon, 16 May 2005 12:52:31 +0000 (12:52 +0000)
committercl349@firebug.cl.cam.ac.uk <cl349@firebug.cl.cam.ac.uk>
Mon, 16 May 2005 12:52:31 +0000 (12:52 +0000)
Merge firebug.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-unstable.bk
into firebug.cl.cam.ac.uk:/local/scratch/cl349/xen-unstable.bk


Trivial merge